Revert "Merge pull request #226 from ferrous-systems/try-hal-migration" #241
Conversation
Deploying ferrous-systems-rust-exercises with
|
| Latest commit: |
0cee38f
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://0841134e.ferrous-systems-rust-exercises.pages.dev |
| Branch Preview URL: | https://revert-226-return-to-nrf-hal.ferrous-systems-rust-exercises.pages.dev |
| let bmrequesttype = usbd::bmrequesttype(usbd); | ||
| let brequest = usbd::brequest(usbd); |
There was a problem hiding this comment.
if I look at the diff in #226, the code should be
| let bmrequesttype = usbd::bmrequesttype(usbd); | |
| let brequest = usbd::brequest(usbd); | |
| let bmrequesttype = usbd.bmrequesttype.read().bits() as u8; | |
| let brequest = usbd.brequest.read().brequest().bits(); |
but maybe the diff view is playing tricks on me here
There was a problem hiding this comment.
using the library function is better, so I didn't revert it
There was a problem hiding this comment.
diffs are not 100% flipped to #226 here, but is only formatting and the #[allow(unreachable_patterns)] is not present here, so it was likely removed since in another PR
| let bmrequesttype = usbd::bmrequesttype(usbd); | ||
| let brequest = usbd::brequest(usbd); |
There was a problem hiding this comment.
again not exactly flipped to #226
| let bmrequesttype = usbd::bmrequesttype(usbd); | |
| let brequest = usbd::brequest(usbd); | |
| let bmrequesttype = usbd.bmrequesttype.read().bits() as u8; | |
| let brequest = usbd.brequest.read().brequest().bits(); |
| let bmrequesttype = usbd::bmrequesttype(usbd); | ||
| let brequest = usbd::brequest(usbd); |
There was a problem hiding this comment.
| let bmrequesttype = usbd::bmrequesttype(usbd); | |
| let brequest = usbd::brequest(usbd); | |
| let bmrequesttype = usbd.bmrequesttype.read().bits() as u8; | |
| let brequest = usbd.brequest.read().brequest().bits(); |
There was a problem hiding this comment.
lines 62-63 should be
let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
let brequest = usbd.brequest().read().brequest().to_bits();the request match differs but only in format and not in logic, so is fine.
| [dependencies] | ||
| cortex-m = {version = "0.7.7", features = ["critical-section-single-core"]} | ||
| cortex-m-rt = "0.7.5" | ||
| dk = { path = "../boards/dk-solution", features = ["radio"] } |
There was a problem hiding this comment.
this is correctly reverted, but not sure if you want that in this case
There was a problem hiding this comment.
it is a bug that the hal-app points to the solution DK.
|
Decided not to revert - fixed instead in #242 |
This reverts commit bd92963, reversing changes made to f475313.
Basically it switches us back to nrf-hal, until #240 is resolved.